bitkeeper revision 1.1159.1.511 (41d2d24csvxPmAj9ZQPfm1CsFAsulA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 29 Dec 2004 15:50:36 +0000 (15:50 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 29 Dec 2004 15:50:36 +0000 (15:50 +0000)
commit38b23dd2a02bbf6ae9a9574767d130831cc8e8bc
treebd8c5f8f7d7a8df714788346fe0a598f29640c88
parent24ffba07d6ffd56939814198a6b570c55295e23c
parent43ac1bd5c3c751223062e91e852c7607c9920fc2
bitkeeper revision 1.1159.1.511 (41d2d24csvxPmAj9ZQPfm1CsFAsulA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk